remove g_print.

Sat Sep  8 01:44:18 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_set_dirty):
	remove g_print.

	* gtk/gtktreeview.c (gtk_tree_view_set_model): unref model when we
	change models, #59899

Sat Sep  8 01:44:32 2001  Jonathan Blandford  <jrb@redhat.com>

	* POTFILES.in: missed one.

diff --git a/ChangeLog b/ChangeLog
index 9ea547858dc75458225332f991f04b4167f6fbbd..27e0aa8ea42940406da49a1b128c51ed74dca256 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Sep  8 01:44:18 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_set_dirty):
+       remove g_print.
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): unref model when we
+       change models, #59899
+
 2001-09-07  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtkmain.c: move some docs inline

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9ea547858dc75458225332f991f04b4167f6fbbd..27e0aa8ea42940406da49a1b128c51ed74dca256 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Sat Sep  8 01:44:18 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_set_dirty):
+       remove g_print.
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): unref model when we
+       change models, #59899
+
 2001-09-07  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtkmain.c: move some docs inline

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9ea547858dc75458225332f991f04b4167f6fbbd..27e0aa8ea42940406da49a1b128c51ed74dca256 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Sat Sep  8 01:44:18 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_set_dirty):
+       remove g_print.
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): unref model when we
+       change models, #59899
+
 2001-09-07  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtkmain.c: move some docs inline

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9ea547858dc75458225332f991f04b4167f6fbbd..27e0aa8ea42940406da49a1b128c51ed74dca256 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Sat Sep  8 01:44:18 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_set_dirty):
+       remove g_print.
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): unref model when we
+       change models, #59899
+
 2001-09-07  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtkmain.c: move some docs inline

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9ea547858dc75458225332f991f04b4167f6fbbd..27e0aa8ea42940406da49a1b128c51ed74dca256 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Sat Sep  8 01:44:18 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_set_dirty):
+       remove g_print.
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): unref model when we
+       change models, #59899
+
 2001-09-07  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtkmain.c: move some docs inline

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9ea547858dc75458225332f991f04b4167f6fbbd..27e0aa8ea42940406da49a1b128c51ed74dca256 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Sat Sep  8 01:44:18 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_set_dirty):
+       remove g_print.
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): unref model when we
+       change models, #59899
+
 2001-09-07  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtkmain.c: move some docs inline

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9ea547858dc75458225332f991f04b4167f6fbbd..27e0aa8ea42940406da49a1b128c51ed74dca256 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Sat Sep  8 01:44:18 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_set_dirty):
+       remove g_print.
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): unref model when we
+       change models, #59899
+
 2001-09-07  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtkmain.c: move some docs inline

diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index 2e7482a10d1f59210cc51271fb40a8dda1af074d..d702f1067d05ccc6a49c817373f2fc500ea1dc98 100644 (file)
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -45,6 +45,26 @@ Utility function to manipulate lists of named, typed arguments.
 Implementation of Object Properties
 
 
+<!-- ##### SECTION ./tmpl/gtkcellrenderertextpixbuf.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtkcellrenderertextpixbuf.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtkcellrenderertextpixbuf.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/gtkcellrenderertextpixbuf.sgml:Title ##### -->
+GtkCellRendererTextPixbuf
+
+
 <!-- ##### SECTION ./tmpl/gtkdata.sgml:Long_Description ##### -->
 <para>
 The #GtkData object is a very simple object intended to be used as a base
@@ -1672,6 +1692,13 @@ arrow.
 @show_toggle_indicator: unused
 @show_submenu_indicator: whether to show the arrow or not
 
+<!-- ##### MACRO gtk_notebook_set_page ##### -->
+<para>
+</para>
+
+@notebook: 
+@page_num: 
+
 <!-- ##### FUNCTION gtk_object_arg_get ##### -->
 <para>
 Private function to get an argument and argument info from an object.

diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml
index 2965acfa7fb52f40a84ca50122f4adec03879dc4..5ed3d8534c81e185e0ebaabe758e99889344bb90 100644 (file)
--- a/docs/reference/gtk/tmpl/gtknotebook.sgml
+++ b/docs/reference/gtk/tmpl/gtknotebook.sgml
@@ -132,15 +132,6 @@ Deprecated compatibility macro.
 @Returns: 
 
 
-<!-- ##### MACRO gtk_notebook_set_page ##### -->
-<para>
-</para>
-
-<!-- # Unused Parameters # -->
-@notebook: 
-@page_num: 
-
-
 <!-- ##### FUNCTION gtk_notebook_next_page ##### -->
 <para>
 </para>

diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml
index 30ffca8235aa804f9d0033f0f1ed9b6a61d8fd94..cc0b23b6d217a6b8beefca09d47e350a7eb6068a 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkrc.sgml
+++ b/docs/reference/gtk/tmpl/gtkrc.sgml
@@ -495,6 +495,7 @@ This can later be composited together with other
 #GtkRcStyle structures to form a #GtkStyle.
 </para>
 
+@parent_instance: 
 @name: 
 @bg_pixmap_name: 
 @font_desc: 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index dbb552316624b0f0cfc5cd22e600d4453ce769f9..1e6b7e8eceeb7f65f106aeec243fa554f9ba92d4 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -6263,6 +6263,8 @@ gtk_tree_view_set_model (GtkTreeView  *tree_view,
 
   if (tree_view->priv->model)
     {
+      gtk_tree_view_unref_and_check_selection_tree (tree_view, tree_view->priv->tree);
+
       g_signal_handlers_disconnect_by_func (G_OBJECT (tree_view->priv->model),
                                            gtk_tree_view_range_changed, tree_view);
       g_signal_handlers_disconnect_by_func (G_OBJECT (tree_view->priv->model),

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 4821e8eb2434ab95f745beed9ad0bae149e36e15..c7bbeb2ce0985881ca850409955b6c77da07599d 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -2357,61 +2357,7 @@ gtk_tree_view_column_cell_set_dirty (GtkTreeViewColumn *tree_column)
     }
   tree_column->dirty = TRUE;
 
-  g_print ("in gtk_tree_view_column_cell_set_dirty\n");
   if (tree_column->tree_view)
     gtk_widget_queue_resize (tree_column->tree_view);
 }
 
-
-#if 0
-static void
-gtk_tree_view_column_cell_foreach (GtkTreeViewColumn *tree_column,
-                                  gboolean           direction,
-                                  GFunc              function,
-                                  gpointer           data)
-{
-  GList *list;
-  GtkTreeViewColumnCellInfo *info;
-
-  if (direction == 1)
-    {
-      for (list = tree_column->cell_list; list; list = list->next)
-       {
-         info = list->data;
-         if (info->pack == GTK_PACK_END)
-           continue;
-         if ((*function) (info, data))
-           return;
-       }
-          
-      for (list = g_list_llast (tree_column->cell_list); list; list = list->prev)
-       {
-         info = list->data;
-         if (info->pack == GTK_PACK_START)
-           continue;
-         if ((*function) (info, data))
-           return;
-       }
-    }
-  else
-    {
-      for (list = g_list_llast (tree_column->cell_list); list; list = list->prev)
-       {
-         info = list->data;
-         if (info->pack == GTK_PACK_START)
-           continue;
-         if ((*function) (info, data))
-           return;
-       }
-      for (list = tree_column->cell_list; list; list = list->next)
-       {
-         info = list->data;
-         if (info->pack == GTK_PACK_END)
-           continue;
-         if ((*function) (info, data))
-           return;
-       }
-
-    }
-}
-#endif

diff --git a/po/ChangeLog b/po/ChangeLog
index 1e9af9c475f03224b96840a2fa7e351cd337a4f7..e8c6164c9c598b422e9013acb1e60b6da927324a 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+Sat Sep  8 01:44:32 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * POTFILES.in: missed one.
+
 2001-09-07  Darin Adler  <darin@bentspoon.com>
 
        * POTFILES.in: Removed gtk/gtkcellrenderertextpixbuf.c

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 88cb9fdb63fc351d4e9ec5551ca0931128830cfe..3db9d1adbd3250b16ea183f3b22439d717e66ba5 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -60,7 +60,6 @@ gtk/gtkbutton.c
 gtk/gtkcellrenderer.c
 gtk/gtkcellrendererpixbuf.c
 gtk/gtkcellrenderertext.c
-gtk/gtkcellrenderertextpixbuf.c
 gtk/gtkcellrenderertoggle.c
 gtk/gtkcheckbutton.c
 gtk/gtkcheckmenuitem.c